updates
Merge branch 'master' of github.com:alienone/Mon

Conflicts: