Hotfix some bugs.
Ups, but now I got it.
Merge branch '2.0.0-Hotfix'

Conflicts:
	Test.txt