Merge pull request #228 from micmac1/asterisk