This time baby I'll be bulletproof

Fixes
Merge branch 'master' of https://github.com/HTMLThorHolland/HTMLThor