version 1.0
Merge pull request #3 from albertoaus/develop

version 1.0