Merge pull request #10 from narrowspark/develop

Develop
http refactor finish
bug fixes
bug fixes
bug fixes
Merge pull request #57 from prisis/refactor

Refactor