Improve rendering times
Merge branch 'master' of https://github.com/alanhdu/hunt