add shape option to draw functions
MAINT: mutualize function
DOC: enhance docstring
DOC: fix mistake optional flag
Merge pull request #1222 from sciunto/add_shape_draw2

Add `shape` option to functions in draw