Fixed #17
Fixed #9
Fixing #15 - in progress
Merge branch 'master' of https://github.com/lpissinali/school