Pull request to master

Please place lines 28 - 36 inside..

```
if (self) {
   // lines 28 - 36
}
```
:bow: