Merged updates from typeof.net website