Yinyins branch 1

Pull request 1