Separate the functions. Add some new functions.
Update README