Merge pull request #115 from khoa-nd/master

Please pull the latest code