updated from master

Signed-off-by: Dimitris Zlatanidis <d.zlatanidis@gmail.com>