Merge remote-tracking branch 'origin/master'
Basic functionality, need style
Signed-off-by: bmomcilov <bojan.momcilov@yandex.com>