Merge pull request #199 from rgrinberg/master

Cosmetic improvements + .merlin