Resolves #22 on website