Merge pull request #114 from khoa-nd/master

Please pull the latest code