Copyright added
Copyright added
Merge branch 'Dev'