stash
master
updated badass
merge