Merge pull request #26 from SteamDragon/master-windows

Master windows