Merge pull request #116 from khoa-nd/master

Please pull the latest code
Merge commit '879a5ab9dde333124a9cd22ad6b369467815c8a9'