Merge pull request #83 from johnsonpham/master

Latest source code
Merge commit 'bd2b57ca6c03c386831dadb894c2d888bee1023b'