Merge branch 'master' into Final
Merge pull request #11 from RohanWu/Final

Merge branch 'master' into Final