Merging changes
Merge branch 'development' of https://github.com/alexmezentsev/nodemail into development