merge nico into master
remove pry
add update section