Merge pull request #8 from trewto/developer

Merge pull request #7 from trewto/master
Security update
Merge pull request #9 from trewto/master

Secuirity Update