Converted tabs to spaces
Added events
Updated req to 5.4