Merge pull request #14 from ajstanley/7.x

eliminated repeats on locking message
fixed license