Changed class diagram.
Merge origin/master