Modify project.xml approach initial working version
Merge branch 'newfeatures'