manual merge
Merge pull request #2 from elgreco84/master

manual merge