a few naming things
added a new example
merge