Improved index queue support
Merge remote-tracking branch 'gooru/master'
Merge pull request #505 from parthibane/master

Improved index queue support