Merge pull request #118 from danmcp/master

Merged by openshift-bot