Merge branch 'master' of github.com:tokuhirom/Minilla
Better error handler