Merge pull request #1 from njdcookbook/master

Merge pull request #1 from srdee/master
Finish initial framework
Merge pull request #2 from srdee/master

Finish initial framework