Merge pull request #2 from srdee/master

Finish initial framework