fix a merge mistake
Merge pull request #190 from cbare/develop

fix a merge mistake