separate files
fix methods
Merge remote-tracking branch 'origin/master' into feature/mmd-renderer