Merge pull request #6 from fontanalorenzo/develop

travis ci