DOC: General Modifs - ISSUE #37 is rectified