Merge pull request #141 from danmcp/master

Merged by openshift-bot