Issue #38.
Merge branch 'issue34' of github.com:sgillies/rasterio into issue34