Fix broken link to class reference
Add missing change coming from #382
Merge branch 'fix-changes'