Refactored into functions
Merge branch 'master' of https://github.com/pargall/UWO-cal