added some rate limit handling
Merge branch 'master' of https://github.com/greedo/NowWatching