Initial commit from Docstring support and corrections on design