Fixed line intersection issue
merge
Merge branch 'master' into old_state