TeamMentor/Dev — pull request #19 by kofisarfo (2013-04-25 04:44:03+00:00)
Title: Issue 363 clean

Includes previous fixes. A growing divergence between this and base repo.