Prepare for 1.1
Added a workaround for #32
Merge branch '1.0-maintenance'