Merge pull request #112 from yshui/master