Refactor
Merge branch 'master' of github.com:afs/quack