Changed @JoanZap and website URL