Pull request to master

Please move lines 28 - 30 inside the `if (self) {...` body. :bow: