fix #3
fix #6
fix #14
Merge branch 'master' of https://github.com/libis/Schatkamer.git