Merge branch 'master' of https://github.com/jsonnull/author
Merge branch 'master' of https://github.com/jsonnull/author