Finally managed to move to github!
Merge git://github.com/thelaui/M.A.R.S.

Catching up with author's repo.