rebase

rebase
fixed issue with stroke.

rebase

another mergefix

rebase
Merge branch 'feature_dots'