exchanges q for tillthen
Merge pull request #7 from cirocosta/feat/tillthen

exchanges q for tillthen