Issue #53 ,Issue #56 fix
Merge branch 'develop' of github.com:senkz/HUSACCT into develop