crate_id; whitespace; crate_type
Merge pull request #29 from cmr/master

Update to master