add copy from master branch
Merge branch 'stable-0.3' into stable-0.4