little changes based on review 2014-06-21

Signed-off-by: Sascha Sigl <saschasigl@gmx.de>