bugfix
Merge branch '76-load-project' into develop