r fixes
code fixes
code fixes
code fixes
Merge pull request #17 from Leprevost/main

fixes