Merge pull request #23 from usr42/issue21_without_issue13

Fix issue 21: Use function pointer for call_history