New bug to fuck with
Merge branch 'master' of github.com:trid/anticivilization