Merge pull request #21 from snakerock/master

Changes
* Windows faping;
* Merge;
* Winfixes;
win commit
* Fixes;
* MORE FIXES FOR THE GOD OF FIXES!!!