GiovanH Merge pull request #1 from GiovanH/dev