Support all of the geometry strings
Merge pull request #53 from kausters/master

Support all of the geometry strings