Merge pull request #134 from danmcp/master

Merged by openshift-bot