Added locking ability
Close #9