Add from testBranch2 (02/11/2014) #1.