Merge pull request #111 from khoa-nd/master

Please pull the latest code