Merge branch 'Milestone-1' into add-readme