Merge pull request #132 from danmcp/master

Merged by openshift-bot