First commit of the v1.0 version
improvements in the 1.0 version
Merge pull request #2 from oscarotero/v1.0

V1.0