Added clear context option

Added the ability to disable the clearing of the context.