Feature/merge updates from blog