Merge pull request #142 from danmcp/master

Merged by openshift-bot