Make Beatport changes
Update TODO
abc
Merge branch 'master' of github.com:Joskinebi/pro
Add possible exception
Don't fail in case of missing info