Fix tests and regexp match
Prepare 0.0.4 release