Fixing Issue_400

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

Fixing Issue_400