Reworked clear method
Constructor now storing parameters
Merging version 0.02 branch