Keep reference to `this`
Merge branch 'Artazor-master'