Starting to develop the Mars framework.
Merge origin/master