Merge branch 'master' into working
Change the return type of setter methods to Done
Merge branch 'working'