Dev up

Bring 1.0.2 into dev