Fix #430
Merge branch 'master' of github.com:MediaCrush/MediaCrush