test and fixed for Mac
Merge branch 'master' of https://github.com/RMeeuws/Hacksby