Merge pull request #17 from jerv13/master

Unit test and general security