merge fix
start new index structure
Merge pull request #198 from nikolaswise/master

merge fix
fix merge conflict