* refactoring
* added / extended documentation