Fix
Fixes
Merge pull request #47 from mailgun/sasha/core

Sasha/core