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