Premier commit
Merge https://github.com/NileTaruma/mess