Album funcionalities
Merged branches.