Merge pull request #66 from danmcp/master

Merged by openshift-bot