More recent pull request.

This pull request includes the refactoring of the last 'closed' pull request and a bug fix to the stroke width