synch up from lamet
Merge branch 'master' of github.com:erch/customenv