bug fixes and mailing error to admin
Merge pull request #14 from odedshr/v0.13-bug-fixes

bug fixes and mailing error to admin