Add extra logging
Merge branch 'master' of /home/maartendekeizer/workspaces/sbs/essence