Version bump to 1.1.1
Merge branch 'master' into enhanced