Add some kind of locking, because slow indexers can fill up server resources (mainly when run in dev mode)
looks good! One thing I want to be done: could you convert the two files from tabs to spaces.
Converted tabs to spaces