Merge pull request #29 from danmcp/master

Merged by openshift-bot