Add copyright
Merge branch '181' into pre_live