updated
merge master to devel (hotfix #50)