Kind of fixing the bug 226 but not ready yet
This kind of fixes the bug but #226 I really need to try it live
Merge pull request #227 from ciudadanointeligente/bounce_handling_bug_issue_226

Bounce handling bug issue 226