Slightly modified interface; give more options (closes #17).