Merge pull request #159 from klausw-g/lock-selection