Fixed issues with merge
Fixed issues with merge

codeforkansascity/address-api,zmon/address-api,zmon/address-api,codeforkansascity/address-api,codeforkansascity/address-api,zmon/address-api,codeforkansascity/address-api,zmon/address-api,zmon/address-api,codeforkansascity/address-api,zmon/address-api,codeforkansascity/address-api