Updated: added missing documentation
Dev: working on tests