Merge pull request #23 from rmoshier/callap

Callap
FINALLY its works.. in the most elemntary way
Merge branch 'master' into callap