Yao-Zhang/Test — pull request #2 by Yao-Zhang (2014-02-20 22:51:39+00:00)
Title: Merge pull request #1 from Yao-Zhang/Branch_1

Pull from master to Branch 1