some commenting
mergefixes
Merge branch 'develop' of https://github.com/klaseskilson/Hathor into develop