Merging v1.0.2 into master

Master currently has v1.0.0