Merge pull request #69 from danmcp/master

Merged by openshift-bot