fix for issue #16
Merge branch 'develop'