Added option to clean the handler
Updated to version 1.0.5