Merge pull request #100 from danmcp/master

Merged by openshift-bot