Some fixes.
Merge pull request #1 from qbanguy/patch-1

Some fixes.