merged updates from master

Signed-off-by: Dominik Richter <dominik.richter@gmail.com>