Merge pull request #11 from wavon/brigitta

Brigitta