Fix of #19
Merge pull request #22 from SnipeStudio/#19

Fix of #19