step2 done
conflict
Merge pull request #11 from saulelis/step2

step2 done