Pull from develop for v0.0.10 release