Final fixes before v1.0
README update
Merge conflicts