Merge pull request #120 from danmcp/master

Merged by openshift-bot