Added lock throttling #103
Merge branch 'develop'