Fixed some typos, re-order blocks
Merge pull request #3 from mickaelandrieu/patch-2

Fixed some typos, re-order blocks