Fixed errors caused by merging branchs. All tests pass.