Small fixes
Merge pull request #48 from noakup/patch-5

Small fixes