Gathering v18, GPW2014
Merge pull request #16 from Hannover-pm/development

Gathering v18, GPW2014