unpack rethinked
Support for quotes inside statement added