Add documantation
Merge with base