Fix warnings and duplication in voicecall code
Merge pull request #23 from jpetrell/master

Fix warnings and duplication in voicecall code