added --first-round-lock option
Merge branch 'release/0.5.4'