Commit submissions from SoulStyle
bug fix id'd by @antimon51 for #181
Merge branch 'develop' of github.com:POSSA/Caller-ID-Superfecta into develop

# By Lorne Gaetz
# Via Lorne Gaetz
* 'develop' of github.com:POSSA/Caller-ID-Superfecta:
  bug fix id'd by @antimon51 for #181
  Commit submissions from SoulStyle
Use new abstracted functions