Comments and km conversion
change JSON keywords
Merge pull request #65 from adrienmathaly/Branch_Debug_and_Tests

Branch debug and tests