added environment detection
bumped version
Merge branch 'release/0.4.8'