Updated Copyright header
Merge branch 'formatter_dev'