small changes
Merge branch 'gucci' of https://github.com/xduhamel/Q into gucci