Merge pull request #121 from nealfennimore/master

Merge conflict fix