Refactored Calls
Merge pull request #258 from eugenst/refactor_calls

Refactored Calls