henkie is a silly

new commit message.

joined some internal commits into one
Merge branch 'develop' of https://github.com/jpbunschoten/hp1 into develop