First approximation: untested

* Minor modifications in documentation
* Basic implementation done