Just a couple more fixes
Small windows fix
Merge pull request #23 from MinekoRox/master

Just a small stability update