changes to phase2
Merge branch 'develop' into feature/Lars