Revert "Merge pull request #8 from 2600hz/3.18"

This reverts commit 6c5e8295b96f03ae99724a23bf2eb1589c2bd815, reversing
changes made to 9df7b29e6708b20f1fa9f03ea81aefc5e853dcf7.
Revert "Revert "Merge pull request #8 from 2600hz/3.18""

This reverts commit 38d41a142e4f2aa9107a109cc818eaba98f6333d.
3.18 update