Merge pull request #78 from danmcp/master

Merged by openshift-bot