automaticly load complete
Merge branch 'dev'