Fixes issue 280
Merge pull request #308 from twitter/feature/issue-280

Fixes issue 280