First upload
Merge http://github.com/jadacyrus/mjordan