Merge remote-tracking branch 'upstream/master'
fix bug: should be if calling_party == callerid
Merge pull request #15 from bretttolbert/master

Fix bug introduced by previous check in