Merge pull request #25 from SteamDragon/master-windows

Master windows
Merge pull request #1 from SnipeStudio/master-windows

Merge pull request #26 from SteamDragon/master-windows