Update 0.6 to reflect changes from 1.0.2