refactoring the code
Merge branch 'master' into callap
Merge pull request #27 from rmoshier/callap

Callap