Fixing issue #107

:+1: Good advices. I'll fix.