Merge pull request #124 from khoa-nd/master

Please pull the latest code
Merge commit '9d3392706502dd0bdd30f46583d54164c44763fc'