Following Moritz Heidkamp's suggested fix, because for some reason it won't automatically merge
Merge branch 'perf' of github.com:ztellman/aleph into perf