Issue #10: refactoring, using corrent user-agents