Merge pull request #115 from danmcp/master

Merged by openshift-bot