Improved documentation
Improved docu