Merging dev branch 1.0