Merge pull request #52 from absolutelyNoWarranty/master

Adjust for consistency. Fix some typos.