Merge pull request #582 from scholtzm/UserHandlerDisposal

Added code for UserHandler disposal.