added gcm, added feedback from Soeren
Merge branch 'master' of github.com:BenStW/MD
moved pauschale to flat