Merge pull request #84 from johnsonpham/master

Latest source code
Merge commit 'ee8a4be7bb18ec62a2834e64f8b0b3dcab268ed1'