Rename Controller class to Handler - fixes #22