Merge pull request #5 from adamretter/master

Operates on both Windows and Linux