working version
Merge pull request #1 from dsaldana/master

working version