minor pull

Just bringing up to date with my dev branch