Refactoring
General
re-release with changes made for documentation generation