fixed bad merge
Merge pull request #675 from john-hill/fix-merge

fixed bad merge