Improved ivan formula, hoping for commit without conflicts.
Merge branch 'master' of https://github.com/Murrx/animated-batman