Little review/fixes. More to come soon.

Signed-off-by: Maurycy Damian Wasilewski <damian.wasilewski@gmail.com>
Merge remote-tracking branch 'origin/master'