Merge pull request #1 from abartolo/Alex_Branch

Alex branch
Merge pull request #3 from abartolo/master

Merge pull request #1 from abartolo/Alex_Branch