Add innerStrokeColor property
fixed conflicts
Merge branch 'shkutkov-master'