Merge pull request #143 from danmcp/master

Merged by openshift-bot