add 3.2
correct merge conflicts
Merge pull request #3 from clauniel/master

merge fra carsten