Make wrap a free function.
Merge branch 'master' into trading_example
Various improvements.
Rename package_t to packaged_token and make packaged_handler public.
Fix uninitialised variable warning.
Merge branch 'master' into trading_example