Add merlin 1.1
Merge pull request #726 from def-lkb/master

Add merlin-1.1