commit for issue #60 and #45
Merge branch 'master' of https://github.com/ProximaCentauri/pointofsale