Rollback the basic function

Rollback
Merge branch 'master' of https://github.com/jemygraw/Personal