Merge pull request #2 from if045/test2

Other message
Merge branch 'develop' into RC-manage-project-layout