Minor adjustments and optimalisations/ refactoring
Merge branch 'master' of https://github.com/pmpod/SimpleHeart.git