version 1.1.0
Merge branch 'dev'