Merge pull request #123 from danmcp/master

Merged by openshift-bot