Add PenWidth class
Merge branch 'develop'