Refactored Connection listener. Sorted includes list.
Merge pull request #6 from treww/master

Refactored Connection listener. Sorted includes list.