berndbischl Merge pull request #2 from jakobbossek/master