Merge pull request #497 from cshore/asterisk-update