Issue #408 - Fixing Documentation