update
Merge pull request #5 from TamChen/testbranch

merged form test testbarnch