Resolved two potential bugs
Merge branch 'master' of https://github.com/bzl/skolen.git
Refactoring