wave-y again
fixed little merges
Merge pull request #23 from rmoshier/callap

Callap