Fixes #310
Merge pull request #312 from MediaCrush/fragments

Fixes #310