Added has_more instance variable

More details on issue #2