first attempt
Merge pull request #1 from Marco-Lindsay/master

first attempt