Rate Limiting, fixes #35
Implemented improvements for rate limiting
Merge pull request #94 from okTurtles/rate-limiting

Rate Limiting, fixes #35