Fix for #54
Merge branch 'develop' of https://github.com/senkz/HUSACCT into develop