Small fixes.
Merge pull request #58 from mesqueeb/patch-29

Small fixes.