Merge pull request #30 from int-index/master

Cleanup patchset