Added int q.

Please pull patch-1 to master