Small enchaments
Merge pull request #8 from raphendyr/patch-1

Small enchantments