Merge pull request #18 from cravacuore/develop

Added png uml, and minor fix
updated uml
Merge pull request #19 from shuragrox/develop

Updated UML