added test for bug in #37
Merge branch 'develop' into testing