Merge pull request geeknam#60 from geeknam/requests

Add requests as a new requirement.

Merge pull request geeknam#52 from suzaku/refactor

Random cleanups