Merge branch 'Devel'
Some Changes