Fix performance

Fix for #14 

Video demonstration: http://tinypic.com/r/2mqjcde/8