Fixes #98

Fixes #98, I'm just concerned with security, any thoughts?