DELETED jos's call test
Merge pull request #39 from flubbes/fabian

merge fabian into update-1