updated and added blog
merge from master