Some cosmetics and typos.
Merge pull request #19 from lcartier/patch-1

Some cosmetics and typos.