Merge pull request #94 from theodi/bugfix-security-issues

Fix security issues spotted by codeclimate
Merge branch 'refs/heads/master' into bugfix-95-nil-organisation