It's fucking done! almost
Merge pull request #12 from saulelis/step2

It's fucking done! almost