sweep changes in 0.2 into master