misc com
Merge misc

* 'master' of https://github.com/LEI/Mars:
  diamond square
misc