q6 refactoring
Merge branch 'master' of https://github.com/snals/jobUCL2013