updating for R17
Merge pull request #1 from marcelog/marcelog_R17

updating for R17