Another static fix attempt?
Merge branch 'master' of github.com:ALandFarAway/alfa009_ms