Merge pull request #6 from vicfran/develop

Merge develop into master
Update version name