Added copyright
Merge branch 'develop'