Added support for expand_fast_index_creation #170

This is #170 rebased on top of the latest master.