Fixes #156 -- re-enable programmatic usage