Merge pull request #69 from mpictor/review/documentation

Review/documentation