commit by doublefish
Merge branch 'master' of github.com:doublefish/doublefish