my final
Merge pull request #19 from alexvalera/mystuff

my final