#20 Updating the generator
#20 Update working version of decorator generator