Merge pull request #121 from danmcp/master

Merged by openshift-bot