Delegation pattern
Fix test
Update readme.md
Fix codesniffer errors