Changes because 1.0.1
Resolving conflict