Working version of LSM.
Merge branch '1.1'