Merge pull request #4 from johannhof/anton

Anton