Add license
Merge remote-tracking branch 'origin/step-1' into step-2
Merge branch 'step-2' into step-3