reinit
Merge branch 'master' of github.com:ahebrank/Lock-Entry
rearrange