Merge pull request #297 from pshevtsov/custom-shapes