Merge pull request #125 from danmcp/master

Merged by openshift-bot