Merge pull request #94 from khoa-nd/master

Please pull the latest code