Merge pull request #1 from feross/master

Pull from fork master
minor fixes
cosmetic tab align
utf-8
Merge pull request #38 from pteek/master

minor fixes