Fixing Issue_475

Signed-off-by: Dinis Cruz <dinis.cruz@owasp.org>
Merge pull request #69 from TeamMentor/Issue_475

Fixing Issue_475