Merge pull request #1 from cantino/master

Update to Master