Merge branch 'master' into development
Merge branch 'master' into development
Added attribution comments.
Merge branch 'development'