Fix: problems 3 and 4, Add correction to my email
Merge pull request #1 from mandrake/master

Fix: problems 3 and 4, an email