Merge remote-tracking branch 'origin/master' into standalone
Merge remote-tracking branch 'origin/standalone' into standalone
Merge pull request #15 from babelsberg/standalone

Merge Standalone Branch