ticket:13 fixing changes
Merge branch 't13_customer'