Merge pull request #2 from leo-editor/master

Update from fork's source