Tests and documentation added
Merge