More tweaks
Merge branch 'material' of github.com:chrisbanes/philm into material