[#2555] [#2601] Bugfixes + version 1.1