Merge pull request #25 from gmazzola/master