Removed upon in favor of Q.
Merge branch 'master' of github.com:cha0s/avocado