Fix merge error
Merge pull request #44 from chuckdumont/master

Fix merge error