Issue #121 - Fix docementation