Add match option
Update and bump to 0.0.6