Deployed changes about #17