Renamed managers to handlers to better reflect what they do
Merge remote-tracking branch 'origin/master'