Merge pull request #110 from danmcp/master

Merged by openshift-bot