Fixed after merging
Fixing #70 - in progress
Issue #71 fixed, pending verification
Merge branch 'master' of https://github.com/lpissinali/school