add column locking
Merge pull request #222 from benitoro/master

add column locking