being picky about not being logged in
Merge branch 'master' into callap
Merge pull request #20 from rmoshier/callap

Callap