meh
merging back to master thanks to Brent..
merged and uptodate