Merge pull request #79 from danmcp/master

Merged by openshift-bot