merge pullrequest of thorsten