Merge pull request #173 from sunyc/master