Merge pull request #2 from kurtstohrer/master

Updating my copy