Merge pull request #849 from ey6es/master

Gonna access that vector from two threads?  Need to lock it.  This was crashing all the time for me.