Issue 20 fix

Email param support and corresponding unit tests.