Added options for enveloping data and the corresponding test

Resolve issue #63