Cleaned up API, fixed readme
Fixed merge conflict