Merge pull request #140 from danmcp/master

Merged by openshift-bot