Merge pull request #94 from Edchen001/MVP-Ver1.6

Mvp ver1.6