Issue 265 fixing documentation and conventions