Merge branch 'master' of github.com:rejas/rasterbator