dev 1.0 to master