Minor fixes
Merge pull request #22 from wiredearp/master

Minor fixes