Changes to allow better cross-platform building. Tested on Windows and Linux
Restoring the original setup
Merge pull request #3 from tkralphs/master

Changes to allow building across major platforms (including Windows)