Merge pull request #93 from zyp/master