Merge pull request #2 from srvr4vr/master

merge to tobias
Merge pull request #3 from srvr4vr/tobias

Merge pull request #2 from srvr4vr/master