WIP
Merge pull request #4 from twokul/echo-nest

WIP