R17-fication
Merge pull request #2 from inaka/elbrujohalcon.R17

R17-fication