Take another run at #222!
Merge pull request #228 from seancorfield/develop

Take another run at #222!