some more modifications
Merge branch 'master' of github.com:alexfikl/school-work