Refactor slightly to allow more fragment types
Merge pull request #1 from bantic/refactor

Refactor slightly to allow more fragment types