Updated to latest rdoc