new style
Merge branch 'master' of github.com:blat/resizr