Pre 1.1

Minor adjustmens @peter-budo