closed #149, team chat!
Merge branch 'master' of github.com:slaeshjag/Muon