Merge pull request #3 from rzr-fwelterlin/fredtest

Fredtest