issue-33

- Docs updated
- Update readme
- Small improvements