Refactored code.
Merge branch 'master' of https://github.com/jp9/DonotDisturb