Fixed but with merging of configuration
Bumped version