Issues 18 and 20.

Fixes #18 and #20. Can now automatically update index of models (if requested in the settings). Also fixes double indexing bug of same objects.