Merge pull request #12 from RonPasquarelli/master

refresh merges on windows as opposed to mac osx