final code
Merge pull request #1 from fecub/master

final code