Merge branch 'develop' of https://github.com/hhennies/Cerberus into develop