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