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