overhaul the way graph options are handled
Merge branch 'hotfix/0.3.0'