Merge pull request #2 from notepadqq/master

rebase from notepadqq/notepadqq
Merge branch 'master' of github.com:notepadqq/notepadqq