Merge pull request #109 from khoa-nd/master

Please pull the latest code