Optimize! Very slight speed boost!

(Ok, I'm done with this now...)
Merge remote-tracking branch 'origin/master'