Almost Final

Need to merge with Alex
Merge pull request #9 from bhasan/master

Almost Final