Changed map so that all lines spawn from one object.
Merge remote-tracking branch 'origin/master'