made errors more visible
Merge branch 'master' of https://github.com/Sundfjord/master.git