Changes suggested in #30.

To be reviewed in a pull request.
Merge pull request #31 from geojson/issue30

Changes suggested in #30.