fix setting index layout
merging

Merge branch 'master' of https://github.com/cdcueva/oliwi into setting-index
Merge pull request #99 from cdcueva/setting-index

Setting index