Merging release 1.0.0 from master to dev