v0.1.7

clean up, improve regex