Merge pull request #24 from TeamMentor/develop

Updating master with develop branch (1.6.0)
Merge pull request #25 from TeamMentor/master

Syncing develop with 1.6.0 release