upload original code base
Merge pull request #1 from colarusso/master

incorperate original code base