Credit contributor. ;)
Merge branch 'v0.4.1'