Merge Bugfixes from master