Added some OS-dependent configuration
Merge pull request #5 from andrewlcg/master

Added some OS-dependent configuration