Merge bug fix
Merge branch 'develop' of https://github.com/thijsghu/HUSACCT.git into develop