Refine
Improve tests
Update README.rst