Some cosmetics and typos.
Merge pull request #20 from lcartier/patch-2

Some cosmetics and typos.