Merge pull request #44 from marc-hanheide/marathon

merge of most recent master changes into this branch