Merge remote-tracking branch 'origin/develop-js' into develop-js-mail
finished #193
refactored mailing logic to fix a logical bug #286
merged #192 and #286 into develop with this commit