Fixed #22
Fixed #34
Fixing #39 - in progress
Merge branch 'master' of https://github.com/lpissinali/school
Fixing #39