2nd pull request

grtz,
Roland