Fixed MCW-Problem
Merge pull request #2 from davidmaack/dev

Fixed MCW-Problem
Merge branch 'master' into dev