Merge christoph

Hi @schiklen 

1. I merged your branch 'stable'
2. and fixed the pom.xml
3. updated the version from 2.0.0 to 2.1.0

... so please merge if you think its OK. 
Kota