Merge pull request #78 from johnsonpham/master

please get latest code
Merge pull request #79 from khoa-nd/master

Please pull the latest code