Merge pull request #49 from rmoshier/callap

Callap
Merge pull request #50 from rmoshier/callap

woopsy
updated to env's
Merge branch 'master' into callap