Merge pull request #1 from 2600hz/3.18

3.18 update