complete phase 1
Merge branch 'phase-1'