Temporary fix for #115 and #117
Merge branch 'master' of https://github.com/Nivekk/KOS