Merge branch 'development'
Merge branch 'development'
Merge branch 'master' into development
update documentation

Signed-off-by: Jan Fischer <info@bitworking.de>