Merge pull request #137 from danmcp/master

Merged by openshift-bot