Spread out features to several files
Merge pull request #122 from joshtombs/jt/split-simple-feature

Spread out features to several files