Fixed line2 bug
Merged master into feature3