Merge pull request #2 from OpenDevelopmentMekong/master

Update
Merge pull request #28 from rdnatividad/master

naro and ross