Merge pull request #107 from TeamMentor/master

Updating 3.4_Release with commits made to master