Fixing ampersand issue and adding album support

Addresses #150 #152 #155