Merge dev (1.1.0) to master branch