Merge pull request #33 from irisshu/master