Merge branch 'master' of github.com:deezzel/new_last_fm