Merge pull request #3 from rzr-fwelterlin/fredtest

Fredtest
Merge pull request #2 from zoeng/master

Merge pull request #3 from rzr-fwelterlin/fredtest