Updating Beer API.
Resolving merge conflicts.