Modified some things.
Merge branch 'master' of https://github.com/hdmaker/amt-project