Fix security issue #48
Merge pull request #49 from alexsalas/development

Fix security issue #48