code fixes
Merge pull request #18 from Leprevost/main

code fixes