Protect from name re-use. Fixes #40.
Merge branch 'develop' into coverity-scan