Added function composition
Merge conflicts solved