Added support for custom ports
Removed stupid internals
Changes after walkthrough
Merge pull request #1 from asafdav/master

Added support for custom ports