Fix headers
Fix copyright
Merge branch 'develop' into release-1.0.1