#120 fix
#115 fix for customer address