Merge pull request #165 from jerv13/master

Update to support indexes on build
Merge remote-tracking branch 'upstream/master'