Merge 1.0b

merge `dev` to `master` release 1.0 beta