Solving polyline problems, and adding some funcionalities.
Merge remote-tracking branch 'origin/master'
Solving merging problems.