fixing 1.1
Merge branch 'fixes'