Some changes
Add documentation