Merged Sopheary and Thomas' work.
Removed temp files.
Merge pull request #3 from sophearychiv/te-work

Te work