merging develop into master

minor correction to project layout