~10% performance improvement, hope i did not break anything
Merge remote branch 'indz/master'