[Issue #48][Issue #49] Documentation fixes