updates for Issue 3
merge Kael website link