Merge pull request #2 from cantino/master

.