Some more corrections :-)
Merge pull request #17 from gaich/patch-3

Some more corrections :-)