merge v1.0.2 -commit 8940f6c- into master