1.0 dev

Updated 1.0 dev from upstream