version 1.1
Merge pull request #1 from marcop07/version_1.1

version 1.1