Processed Oscar's review comments
Merge pull request #4 from securesoftwaredev/master

Processed Oscar's review comments