changed for 0.7.0
Merge pull request #314 from Fabbi/dev

Some Merge-Errors I stumbled upon.