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