Merge pull request #2 from srvr4vr/master

merge to tobias