Merge pull request #150 from danmcp/master

Merged by openshift-bot