Merging Magic
Merge pull request #10 from jcchin/master

Merging Magic