Final changes
Merge branch 'dev' of https://github.com/kirankoduru/email-sifter into dev