Pull Request 

Done and changed set_url() to $current_page();