fixed merge issue
Merge pull request #739 from john-hill/develop

fixed merge issue