BUG: fix linestyle for solid lines
merge PR #23 from origin/fix-solid-linestyle, resolve conflict
Merge branch 'fix-solid-linestyle'