Merge pull request #1 from abartolo/Alex_Branch

Alex branch