Merge pull request #209 from Lertsenem/pr-lsratelimit