Merge pull request #122 from danmcp/master

Merged by openshift-bot