Locking changes
Merge pull request #2 from hkaiser/nosilo

Locking changes