working on email2
Merge branch 'master' of https://github.com/zoopreme/BerkeleyStub