Merge pull request #31 from lwanghaol/master

merger