framework 2.1 update
Merge pull request #3 from mikedm139/master

Framework 2.1 update (do-over)