Work on #4

Don´t merge it now!
I test it tomorrow