commit changes on issue #114
Merge branch 'master' of http://github.com/ProximaCentauri/pointofsale