Merge pull request #96 from danmcp/master

Merged by openshift-bot