issue-33

- update docs
- complete code refactoring