add 'figure' argument
fix handling of 'extra' set
Merge pull request #36 from andrenarchy/gcf

add 'figure' argument