Changes routes, fixes #7