Added album support
Merge pull request #13 from amoliski/feature-album-support

Feature album support