merge v1.0 commit 9aea043 on master