Merge pull request #2656 from Jonahss/master

update to 1.1.0