Add copyright
Merge branch '181' into test