1.0.0 dev

syncing master with 1.0.0-dev