Merge pull request #89 from 2600hz/KAZOO-505

Kazoo 505