Improve performance
Merge branch 'master' of github.com:bcncommerce/stream-wrapper