bug fixes towards release, fixed #13
Merge branch 'master' of github.com:DataAnalyticsinStudentHands/TerryApplication