finished merge
Merge pull request #3 from hoanghw/local

finished merge