Merge pull request #1 from fix8/dev

Makefile error
Fixed "Unresolved External Symbol" on windows build
Merge pull request #129 from richbourne/dev

Dev