Enh : Test - Begin hand made merge of #608
Update doc-string.
Enh : Test - Add Docstring
Enh : Test - Keep on merging
Enh : Test - Keep on merging
Enh : Test - End merge, close #608