Index fixes
Merge branch 'v0.6.0-ChickenUnleashed' of https://github.com/radicalgraphics/escriba into v0.6.0-ChickenUnleashed