forked commit
Merge pull request #77 from verbledd/master

forked commit