Merge pull request #100 from khoa-nd/master

Please pull the latest code