Fixing Issue_459

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

Fixing Issue_459