Merging fixes from a fork by Daniel D'Abate (Thank you!), plus some minor style changes
Merging fixes from a fork by Daniel D'Abate (Thank you!), plus some minor style changes

ArtemGordinsky/Spotifree,ArtemGordinsky/Spotifree