Cleanup and add another testcase
Update example in README.md