Merge pull request #102 from khoa-nd/master

Please pull the latest code