[Added] more changes from The Project.
Merge branch 'v0.0.1'