Merge pull request #96 from khoa-nd/master

Please pull the latest code
Merge commit '54880529053ea3946ff615ff5d94814530bb9f49'