Morale bugfix & tuning
Merge branch 'master' of https://github.com/jtruscott/pyweek16