Merge pull request #42 from subaochen/master