Merge of ofeefee and jarridgraham

merged our branches , or mine with yours with our latest stuff