Fix #6
Merge branch 'development' of https://github.com/Hasselmannen/sleepfighter into development