Support R17
Merge pull request #6 from dcorbacho/R17

Support R17