Separate env

This resolves issue #48