trying to merge with master

its nasty
hmmm

my stuff is guud