First commit on mare
Merge pull request #1 from mgdp/mare

First commit on mare