updated to env's
Merge branch 'master' into callap
Merge pull request #51 from rmoshier/callap

Callap