Better environment handling (now with tests!)
Release 0.0.11
Merged.