ignacio Merge pull request #19 from spacewander/master