Use $self, instead of $t, more descriptive
Merge branch 'master' into gh-pages