Merge pull request #129 from danmcp/master

Merged by openshift-bot