Merge pull request #101 from danmcp/master

Merged by openshift-bot
Naming fix