syncing changes#10

NoneSince wants to merge 8 commits into

masterNoneSince/construct:masterfrom

mabofoul/step_by_stepNoneSince/construct:mabofoul/step_by_stepCopy head branch name to clipboard