Merge Forks and Bugfix