Just made the directoryReader tests green
Some optimizations for SongNameBuilder
Readme updated