Merge pull request #61 from danmcp/master

Merged by openshift-bot