Merge branch 'development' of git.hemio.de:xerus/xerus into development