Fixes #40, refactored code
Merge branch 'Development' of https://github.com/bbsss/HUSACCT into Development