pull request merged from tobias-khs and vamship