Merge pull request #43 from industrial-sloth/0.4.x

0.4.x: indexing and bug fixes
Merge remote-tracking branch 'upstream/0.4.x' into 0.4.x