change in line.cpp
merge form albert