#41 Add the onlyUrl, manually merge the develop branch