Merge pull request #102 from danmcp/master

Merged by openshift-bot