Giving credit
Merge pull request #927 from jakearchibald/master

Giving credit