Merge pull request #29 from christensenep/master

Initial framework