Fixed issue #39
Fix to #46
Merge branch 'new-Implementation-Module' of https://github.com/senkz/HUSACCT into new-Implementation-Module