Merge pull request #85 from danmcp/master

Merged by openshift-bot