Merge pull request #73 from kraman/master

Merged by openshift-bot