Refactoring
Add caller
Update README