Development to master merge.

Also investigate, what's better:
your solution
```or```
use the same method name in ```onClick``` in xml