Somehow made it work on Windows.. dafuk
Merge branch 'master' into winbugs