1.0.0 dev

syncing up master and the 1.0.0-dev branch