Merge pull request #21 from newsoft/master

Fixing two more security issues (remote server crash)