Adding Moon fixes
Merge branch 'master' of github.com:lambda2/Muffin