added more tests. fixed regex
updated jar