Bugfixes for Windows
Merge branch 'master' of https://github.com/carthach/rhythmCAT