Master bugfixed 1.1