Merge pull request #9 from kcbraunschweig (after rebase)