Merge pull request #131 from danmcp/master

Merged by openshift-bot