Added redirection of getters and setters.
Renaming and class enheritance.
Merged ..