Fix crash on MW 1.43 #62 and some code clean up#64

malberts merged 2 commits intooetterer:masteroetterer/BootstrapComponents:masterfrom

WouterRademaker:fix_hookshandlerWouterRademaker/BootstrapComponents:fix_hookshandlerCopy head branch name to clipboard