Merge pull request #40 from alexkonradi/unstable

Fix email parsing bugs