added locking feature
Merge origin/master
added diploma