Changes by Frederik J Simons <fjsimons@gmail.com>
Merge branch 'master' of https://github.com/fjsimons/MMASS