Security Options Added and minor cleanup
Merge pull request #27 from espellcaste/master

Security Options Added and minor cleanup