push dev to master

Release 1.0