security and optimisation

security and optimisation
Merge pull request #71 from mact9/patch-1

security and optimisation