the first version of my magnum opus
Merge pull request #4 from spp319/master

the first version of my magnum opus