Merge pull request #1060 from JoesCat/master

More credits, stopped reading at git 2003-7-31 for now...