Merge pull request #1 from aaldim1/master

initial commit
Merge pull request #1 from MCME/master

Merge pull request #1 from aaldim1/master