Issue: #444 - Fixing documentation