Added options for enveloping data and the corresponding test
Added check for ?envelop=false and corresponding test
Merge pull request #65 from pengux/master

LGTM. Thanks for the contribution!