merlin: 1.0 version
Merge pull request #603 from asmanur/master

merlin: 1.0 version