Fix wrong start script.
Fix error with inheritance.
Merge branch 'develop'