Rename method and sort out error message
Remove rdoc dependency