Small improvments
Merge pull request #26 from telehash/small-improvements

Small improvments