Refactoring.
Update README and CHANGES.
Merge branch '1.1'