Ma's first try
Merge pull request #2 from Merisc/master

Ma's first try