Added q_values function
Merge branch 'master' of https://github.com/sagieske/AA1
Merge fix