Issue #46 , modified UML and documentation