first commit
Merge http://github.com/deetoo/mars