This is the weirdest fix ever
Merge branch 'master' of https://github.com/jacobrs/HwrkIt into devjg

merge with master