Fix merge
Fix again
Merge pull request #6 from bmneely/fix-merge

Fix merge