Optimized diff loading time. Fixes #19