Fix #17

Adding comments about the fields and class
close #18