schemeway Merge pull request #7 from egallesio/master