Merge pull request #1 from NFicano/master

Update from the main repo