Make it ready for real life usage
Merge pull request #13 from ZenCocoon/patch-1

Make it ready for real life usage