new version 1.1
Merge pull request #1876 from Zarph/master

New version 1.1