Edition 1.2
Fixed merge conflicts
Edition 1.2