koolamusic Merge pull request #55 from koolamusic/self-described