Samaverett

Please update master with my latest changes