added jquery
merged and up to date