Tweaking performance
Merge branch 'master' of https://github.com/psibernetic/Susanoo.git