misc
Merge branch 'master' of github.com:glutamate/quantal