Second Attempt
Merge pull request #2 from nsmits/master

Second Attempt