Fixing documentation and method. Related to #41