Fixing documentation and code issue #211