q 1.1.2

Hi,

Did a proper rebase this time. Hope that's ok.