#90 change url as more reasonable way