Merge branch 'develop' into issue194
Merge pull request #212 from irvs/issue194

Merge branch 'develop' into issue194