Updated with options support
Added slightly better tests. Still not great.