fixed env and rspec
merge after rspec fix
Merge branch 'xypalmer'

merge