merged with master
Merge branch 'John_devBranch' into henrik_dev