Moved the content from the "mischa" branch to the master branch

Merge was not possible due to how the branch was created.