Credit.
Merge branch 'master' into structure