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

Fixed MCW-Bug
Merge branch 'master' into dev
Merge branch 'origin/dev'