minor modifications
Merge pull request #29 from binaryberry/master

minor modifications