More fixes
Merge pull request #101 from wiredearp/master

More fixes