fixed docs and getAll method
merged conflict