added current page to URL and some error handling
merge readme