Little more testing and caching ready
Update read me and merged