Add explicit connect handlers
Merge pull request #49 from jasonLaster/remove-magic-handlers

Add explicit connect handlers