Merge pull request #81 from danmcp/master

Merged by openshift-bot