Fix for issue #76
Merge branch 'master' of https://github.com/Nivekk/KOS