my commit
Merge pull request #7 from fdani/master

my commit