Merge.
Bumped version number. Fixed config. Updated environment.