Update for new measure and size spec.
Merge pull request #12 from diagrams/new-stuff

New Stuff x