Merge pull request #130 from danmcp/master

Merged by openshift-bot