Fixed POM
Merge remote-tracking branch 'origin/v2.0.1' into v2.0.1