Merge branch 'documetation'
Merge branch 'implementation'
Merge branch 'master' into implementation