Merge pull request #12 from sharoonthomas/develop

Refactoring to make indices updatable
Fix method call name